Remove the right XID from the xid table. (#34327, Sampo Savolainen, Tim

2006-06-04  Matthias Clasen  <mclasen@redhat.com>

        * gdk/x11/gdkfont-x11.c (_gdk_font_destroy): Remove the right
        XID from the xid table.  (#34327, Sampo Savolainen, Tim Janik)

diff --git a/ChangeLog b/ChangeLog
index ab1a0200250442e88e5c6281663abde2c6e4602b..a2e1455b10ad9d20c270b7cfe060e5b030851bf2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-04  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/x11/gdkfont-x11.c (_gdk_font_destroy): Remove the right
+       XID from the xid table.  (#34327, Sampo Savolainen, Tim Janik)
+
 2006-06-04  Behdad Esfahbod  <behdad@gnome.org>
 
        * gtk/gtkprintoperationpreview.h: Add missing G_END_DECLS (#343838)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ab1a0200250442e88e5c6281663abde2c6e4602b..a2e1455b10ad9d20c270b7cfe060e5b030851bf2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-06-04  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/x11/gdkfont-x11.c (_gdk_font_destroy): Remove the right
+       XID from the xid table.  (#34327, Sampo Savolainen, Tim Janik)
+
 2006-06-04  Behdad Esfahbod  <behdad@gnome.org>
 
        * gtk/gtkprintoperationpreview.h: Add missing G_END_DECLS (#343838)

diff --git a/gdk/x11/gdkfont-x11.c b/gdk/x11/gdkfont-x11.c
index 4833283ab0fc31850d88e0e19fa21f7664f3e226..16d93e27f524399e9eeeaa639ed4dfb6f2146c80 100644 (file)
--- a/gdk/x11/gdkfont-x11.c
+++ b/gdk/x11/gdkfont-x11.c
@@ -367,7 +367,7 @@ _gdk_font_destroy (GdkFont *font)
   switch (font->type)
     {
     case GDK_FONT_FONT:
-      _gdk_xid_table_remove (private->display, ((XFontStruct *) private->xfont)->fid);
+      _gdk_xid_table_remove (private->display, private->xid);
       XFreeFont (GDK_DISPLAY_XDISPLAY (private->display),
                  (XFontStruct *) private->xfont);
       break;